Admin can select groups in user creation

[cavote.git] / main.py

diff --git a/main.py b/main.py
index b00b879..2ab60f8 100755 (executable)
--- a/main.py
+++ b/main.py
@@ -148,7 +148,8 @@ def user_password(userid):
 def admin_users():
     if not session.get('user').get('is_admin'):
         abort(401)
-    users = query_db('select * from users order by id desc')
+    users = query_db('select *, roles.name as rolename from (select *, name as username from users join user_role on id=id_user order by id desc) join roles on id_role=roles.id')
+    # :TODO:maethor:20120530: Find a way to reduce the dict
     return render_template('admin_users.html', users=users)
 
 @app.route('/admin/users/add', methods=['GET', 'POST'])
@@ -165,12 +166,23 @@ def admin_user_add():
             g.db.execute('insert into users (email, name, organization, password, is_admin) values (?, ?, ?, ?, ?)',
                     [request.form['email'], request.form['username'], request.form['organization'], password, admin])
             g.db.commit()
-            # :TODO:maethor:120528: Send mail
-            flash(u'Le nouvel utilisateur a été créé avec succès', 'success')
-            return redirect(url_for('home'))
+            user = query_db('select * from users where email = ?', [request.form["email"]], one=True)
+            if user:
+              for role in request.form.getlist('roles'):
+                  # :TODO:maethor:120528: Check if this role exist
+                  if query_db('select id from roles where id = ?', role, one=True) is None:
+                      abort(401)
+                  g.db.execute('insert into user_role values (?, ?)', [user['id'], role])
+                  g.db.commit()
+              # :TODO:maethor:120528: Send mail
+              flash(u'Le nouvel utilisateur a été créé avec succès', 'success')
+              return redirect(url_for('admin_users'))
+            else:
+                flash(u'Une erreur s\'est produite.', 'error')
         else:
             flash(u"Vous devez spécifier une adresse email.", 'error')
-    return render_template('admin_user_new.html')
+    groups = query_db('select * from roles where system=0') 
+    return render_template('admin_user_new.html', groups=groups)
 
 #-------------
 # Roles admin